Merge "Be stricter for file types where we don't know canonical extension"